Merge tag 'upstream/2016.4' into debian/master
authorSimon McVittie <smcv@debian.org>
Mon, 28 Mar 2016 11:33:21 +0000 (12:33 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 28 Mar 2016 11:33:21 +0000 (12:33 +0100)
Upstream version 2016.4


Trivial merge